screenShield: Don't crash when trying to deactivate the shield

If the user has a lock delay, or deactivate() has been called at
any other time, we need to check for the unlock dialog, as it may
not always exist.

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 151f70b4c20b77f22fbd5af4dcae85c82003faf5..38ac63e7f518e2d5c4cb1b357ad064c771e81ecc 100644 (file)
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -1123,9 +1123,12 @@ const ScreenShield = new Lang.Class({
     },
 
     deactivate: function(animate) {
-        this._dialog.finish(Lang.bind(this, function() {
+        if (this._dialog)
+            this._dialog.finish(Lang.bind(this, function() {
+                this._finishDeactivate(animate);
+            }));
+        else
             this._finishDeactivate(animate);
-        }));
     },
 
     _finishDeactivate: function(animate) {